From 279c8621cf3de7361a13f8e8c0f3d147a0e78446 Mon Sep 17 00:00:00 2001 From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Mon, 1 Jun 2020 05:26:31 -0600 Subject: [PATCH] fix Qt 5.15.0 Wdeprecated-declarations warnings for (#583) QTime::start() QTime::elapsed() --- gui/map.cc | 4 ++-- gui/map.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gui/map.cc b/gui/map.cc index 5f366d335..1546a6c7e 100644 --- a/gui/map.cc +++ b/gui/map.cc @@ -117,11 +117,11 @@ Map::~Map() #ifdef DEBUG_JS_GENERATION if (dbgout_) { delete dbgout_; - dbgout_ = NULL; + dbgout_ = nullptr; } if (dbgdata_) { delete dbgdata_; - dbgdata_ = NULL; + dbgdata_ = nullptr; } #endif } diff --git a/gui/map.h b/gui/map.h index cced27bfc..460e1c9b7 100644 --- a/gui/map.h +++ b/gui/map.h @@ -28,7 +28,7 @@ #include #endif #include -#include +#include #include #include #include "gpx.h" @@ -113,7 +113,7 @@ private: const Gpx& gpx_; bool mapPresent_; bool busyCursor_; - QTime stopWatch_; + QElapsedTimer stopWatch_; QPlainTextEdit* textEdit_; void evaluateJS(const QString& s, bool update = true); -- 2.30.2